From 943a72a09af452eb1654b10ebdae7ce064f29718 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 3 Jul 2006 08:56:29 +0100 Subject: [PATCH] [BUILD] Miscellaneous build-system fixes and tweaks. * Don't delete non-existent %.tar.bz2 in buildconfigs/Rules.mk's %-mrproper * Add a mrpropper target to buildconfigs/mk.linux-2.6-xen, and have this delete the local tarball - This should also delete the local patch, if there is one, but I am not sure how to do this with the current incarntation of the code, and I will post a subsequent patch which makes this easier and effects this chang. As there currently is no local patch this is not a big deal at this moment. (Horms) * Stop kclean from erroring out if the kernel directory doesn't exist * Remove patches/*/.makedep in top level Makefile rather than in buildconfigs/Rules.mk, as calling rules in the latter causes patches/*/.make to be created (Magnus) Signed-Off-By: Magnus Damm Signed-Off-By: Horms --- Makefile | 1 + buildconfigs/Rules.mk | 7 ++----- buildconfigs/mk.linux-2.6-xen | 8 +++++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 703f47daf1..186b756765 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,7 @@ distclean: rm -rf dist patches/tmp for i in $(ALLKERNELS) ; do $(MAKE) $$i-delete ; done for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-mrproper ; done + rm -rf patches/*/.makedep # Linux name for GNU distclean .PHONY: mrproper diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk index a889c32ea0..5e7d659a5b 100644 --- a/buildconfigs/Rules.mk +++ b/buildconfigs/Rules.mk @@ -59,10 +59,6 @@ ifneq ($(PATCHDIRS),) $(patsubst patches/%,patches/%/.makedep,$(PATCHDIRS)): patches/%/.makedep: @echo 'ref-$*/.valid-ref: $$(wildcard patches/$*/*.patch)' >$@ -.PHONY: clean -clean:: - rm -f patches/*/.makedep - ref-%/.valid-ref: pristine-%/.valid-pristine set -e rm -rf $(@D) @@ -111,7 +107,8 @@ linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref rm -rf tmp-$@ %-mrproper: - rm -rf pristine-$(*)* ref-$(*)* $*.tar.bz2 + $(MAKE) -f buildconfigs/mk.$*-xen mrpropper + rm -rf pristine-$(*)* ref-$(*)* rm -rf $*-xen.patch .PHONY: config-update-pae diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen index 04070337f1..ce861acc1b 100644 --- a/buildconfigs/mk.linux-2.6-xen +++ b/buildconfigs/mk.linux-2.6-xen @@ -47,8 +47,14 @@ config: $(LINUX_DIR)/include/linux/autoconf.h .PHONY: clean clean:: - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) clean + [ ! -d $(LINUX_DIR) ] || \ + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) clean + .PHONY: delete delete: rm -rf tmp-linux-$(LINUX_VER) $(LINUX_DIR) + +.PHONY: mrpropper +mrpropper: + rm -f linux-$(LINUX_VER).tar.bz2 -- 2.30.2